socket: Use Window instead of GdkNativeWindow

diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index 3550f18caf9f7921560a3ac15438afad05985d48..8b92a23dc7c6d9f340743ff92f9ba6123e26515b 100644 (file)
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -149,7 +149,7 @@ static void     gtk_socket_forall               (GtkContainer     *container,
                                                 GtkCallback       callback,
                                                 gpointer          callback_data);
 static void     gtk_socket_add_window           (GtkSocket        *socket,
-                                                 GdkNativeWindow   xid,
+                                                 Window            xid,
                                                  gboolean          need_reparent);
 static GdkFilterReturn gtk_socket_filter_func   (GdkXEvent        *gdk_xevent,
                                                  GdkEvent         *event,
@@ -307,7 +307,7 @@ gtk_socket_new (void)
 /**
  * gtk_socket_add_id:
  * @socket_: a #GtkSocket
- * @window_id: the window ID of a client participating in the XEMBED protocol.
+ * @window: the Window of a client participating in the XEMBED protocol.
  *
  * Adds an XEMBED client, such as a #GtkPlug, to the #GtkSocket.  The
  * client may be in the same process or in a different process. 
@@ -324,7 +324,7 @@ gtk_socket_new (void)
  **/
 void           
 gtk_socket_add_id (GtkSocket      *socket,
-                  GdkNativeWindow window_id)
+                  Window          window)
 {
   g_return_if_fail (GTK_IS_SOCKET (socket));
   g_return_if_fail (_gtk_widget_get_anchored (GTK_WIDGET (socket)));
@@ -332,7 +332,7 @@ gtk_socket_add_id (GtkSocket      *socket,
   if (!gtk_widget_get_realized (GTK_WIDGET (socket)))
     gtk_widget_realize (GTK_WIDGET (socket));
 
-  gtk_socket_add_window (socket, window_id, TRUE);
+  gtk_socket_add_window (socket, window, TRUE);
 }
 
 /**
@@ -348,7 +348,7 @@ gtk_socket_add_id (GtkSocket      *socket,
  * 
  * Return value: the window ID for the socket
  **/
-GdkNativeWindow
+Window
 gtk_socket_get_id (GtkSocket *socket)
 {
   g_return_val_if_fail (GTK_IS_SOCKET (socket), 0);
@@ -1027,7 +1027,7 @@ gtk_socket_forall (GtkContainer *container,
  */
 static void
 gtk_socket_add_window (GtkSocket       *socket,
-                      GdkNativeWindow  xid,
+                      Window           xid,
                       gboolean         need_reparent)
 {
   GtkWidget *widget = GTK_WIDGET (socket);

diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h
index c823d5088713cf434e8033429002f05404d20b17..c5be024abfffe4f5d61188daab41384eae90c399 100644 (file)
--- a/gtk/gtksocket.h
+++ b/gtk/gtksocket.h
@@ -34,6 +34,7 @@
 
 #ifdef GDK_WINDOWING_X11
 
+#include <gdk/gdkx.h>
 #include <gtk/gtkcontainer.h>
 
 G_BEGIN_DECLS
@@ -76,8 +77,8 @@ GType          gtk_socket_get_type (void) G_GNUC_CONST;
 GtkWidget*     gtk_socket_new      (void);
 
 void            gtk_socket_add_id (GtkSocket       *socket_,
-                                  GdkNativeWindow  window_id);
-GdkNativeWindow gtk_socket_get_id (GtkSocket       *socket_);
+                                  Window            window);
+Window          gtk_socket_get_id (GtkSocket       *socket_);
 GdkWindow*      gtk_socket_get_plug_window (GtkSocket       *socket_);
 
 G_END_DECLS